…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Aharon Malkin <amalkin@nvidia.com>

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com
Signed-off-by: Aharon Malkin <amalkin@nvidia.com>

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>

PR #20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR #20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Priyansh Tratiya <ptratiya@microsoft.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Andoni Sanguesa <andoniesanguesa@gmail.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Andoni Sanguesa <andoniesanguesa@gmail.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Saravanan Sellappa <saravanan@nexthop.ai>

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Lakshmi Yarramaneni <lakshmi@nexthop.ai>

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com
Signed-off-by: Lakshmi Yarramaneni <lakshmi@nexthop.ai>

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Yael Tzur <ytzur@nvidia.com>

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com
Signed-off-by: Yael Tzur <ytzur@nvidia.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Yael Tzur <ytzur@nvidia.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: nnelluri-cisco <nnelluri@cisco.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Raghavendran Ramanathan <rraghav@cisco.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Zhuohui Tan <zhuohui.tan@amd.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: Abhishek <abhishek@nexthop.ai>

Note: this is a manual cherry-pick to msft-202412 of
sonic-net#20552
Note: depends on sonic-net#20382 to
pass static analysis.

### Description of PR
Skip the following tests:
decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset]
vxlan/test_vxlan_decap.py

for the following topologes:
- t0-isolated-d32u32s2
- t0-isolated-d256u256s2
- t0-isolated-v6-d32u32s2
- t0-isolated-v6-d256u256s2
- t1-isolated-d56u2
- t1-isolated-d56u1-lag
- t1-isolated-d448u15-lag
- t1-isolated-v6-d56u2
- t1-isolated-v6-d56u1-lag
- t1-isolated-v6-d448u15-lag
- t1-isolated-d32
- t1-isolated-d128
- t1-isolated-v6-d128
- t0-isolated-d96u32s2
- t0-isolated-v6-d96u32s2

Summary:
Fixes # (issue)

### Type of change
- [ ] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
    - [ ] Skipped for non-supported platforms
- [x] Test case improvement

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [x] 202412

### Approach
#### What is the motivation for this PR?
Skip tests that are not required for the following topologies:
t0-isolated-d32u32s2, t0-isolated-d256u256s2, t0-isolated-v6-d32u32s2,
t0-isolated-v6-d256u256s2, t1-isolated-d56u2, t1-isolated-d56u1-lag,
t1-isolated-d448u15-lag, t1-isolated-v6-d56u2, t1-isolated-v6-d56u1-lag,
t1-isolated-v6-d448u15-lag, t1-isolated-d32, t1-isolated-d128,
t1-isolated-v6-d128, t0-isolated-d96u32s2, t0-isolated-v6-d96u32s2.

#### How did you do it?
Added a skip conditional mark to the following tests:
decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset]
vxlan/test_vxlan_decap.py

#### How did you verify/test it?
Tried to run the test and confirmed it is skipped.

…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Description of PR
Summary:
update pre-commit version to include the fix for sonic-net#20382

Approach
What is the motivation for this PR?
update pre-commit version to include the fix for sonic-net#20382

How did you do it?
update referencing version.

signed-off-by: jianquanye@microsoft.com

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>

PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <xiwang5@microsoft.com>
Signed-off-by: selldinesh <dinesh.sellappan@keysight.com>